Apply patch from Samuel Thibault to disable Java and TBB on Hurd. Closes: #1094994.

Make TBB architecture settings consistent.

Remove handling of removed kfreebsd.

diff --git a/debian/control b/debian/control
index bb3364c32ed7ff50eddd94623891d71967f7d925..0042cf1bc3e89b3c67ae18eb90a58bcfd7ee174b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: dpkg-dev (>= 1.22.5),
                chrpath,
                cmake,
                debhelper-compat (= 13),
-               default-jdk [!hppa !hurd-any !kfreebsd-any],
+               default-jdk [!hppa !hurd-any],
                default-libmysqlclient-dev,
                dh-sequence-python3,
                doxygen-latex,
@@ -91,7 +91,7 @@ Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         default-jdk [!hppa !hurd-any !kfreebsd-any],
+         default-jdk [!hppa !hurd-any],
          default-libmysqlclient-dev,
          libavcodec-dev,
          libavformat-dev,
@@ -117,12 +117,12 @@ Depends: ${misc:Depends},
          libproj-dev,
          libpython3-dev,
          libswscale-dev,
-         libtbb-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !alpha !ia64],
+         libtbb-dev [linux-any],
          libtheora-dev,
          libtiff-dev,
          libutfcpp-dev,
          libvtk9.3 (= ${binary:Version}),
-         libvtk9-java (= ${binary:Version}) [!hppa !hurd-any !kfreebsd-any],
+         libvtk9-java (= ${binary:Version}) [!hppa !hurd-any],
          libx11-dev,
          libxft-dev,
          libxml2-dev,

diff --git a/debian/rules b/debian/rules
index 2884a98d7d3279028b46e943139d9637be56b8ea..1e8d58eb607bca7fc3ab20901a0f596dc5939ebe 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,9 @@ BUILDDIR = $(CURDIR)/debian/build
 
 include /usr/share/dpkg/architecture.mk
 
-nojava_archs=hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64
-ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(nojava_archs)))
+nojava_archs=hppa
+nojava_os=hurd
+ifeq (,$(filter $(DEB_BUILD_ARCH), $(nojava_archs))$(filter $(DEB_BUILD_ARCH_OS), $(nojava_os)))
   export JAVA_HOME=/usr/lib/jvm/default-java
   extra_flags += -DVTK_WRAP_JAVA=ON
 endif
@@ -14,8 +15,9 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4))
   export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif
 
-notbb_archs=hurd-i386 kfreebsd-i386 kfreebsd-amd64
-ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(notbb_archs)))
+notbb_archs=
+notbb_os=hurd
+ifeq (,$(filter $(DEB_BUILD_ARCH), $(notbb_archs))$(filter $(DEB_BUILD_ARCH_OS), $(notbb_os)))
   extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB"
 else
   extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="OpenMP"